auto merge of #589 : alexcrichton/cargo/fix-win64, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 17 Sep 2014 20:15:50 +0000 (20:15 +0000)
committerbors <bors@rust-lang.org>
Wed, 17 Sep 2014 20:15:50 +0000 (20:15 +0000)
commit29e6a4ffb9c231d3775ba44d8b03d5280079f83f
tree8a1c0903ae19666d33bfd3b50e2affd283501d52
parentb86ae44422789e45ae85bfbf3cd38c3c68fc76e0
parenteaafcab0ff298302b4cb613434af0a6d8c1b5e4c
auto merge of #589 : alexcrichton/cargo/fix-win64, r=alexcrichton

See comments in the makefile